merge vt. 吞沒,吸收;使消失(在…中) (in; into); 【法律】合并(公司等)使并入,使結(jié)合,融合 (into; with)。 All fear was merged in curiosity. 在好奇心驅(qū)使下忘了一切恐怖。 vi. 被吞沒,被吸收,收入,消沒在;合并,并入。 The twilight merged into darkness. 薄暮已消失在黑暗之中。 merge with the masses 同群眾打成一片。
Its concept of a conflict is purely textual , arising when two changes to the same base file are near enough to spook the merge command 其沖突概念純粹是文本意義上的,當(dāng)對于同一基本文件的兩個更改時間上非常非常接近,從而使合并命令受到干擾時,就會發(fā)生沖突。